Merge branch 'master' into TemporaryHackishBranch

# Conflicts:
#	Common/GPU/Vulkan/VulkanRenderManager.cpp
#	Core/Config.cpp
#	Core/HW/MediaEngine.cpp
#	UI/CwCheatScreen.cpp
#	UI/MainScreen.cpp
#	UI/MiscScreens.cpp
#	Windows/resource.h

UI/ProfilerDraw.cpp

@@ -26,6 +26,7 @@
 #include "Common/Profiler/Profiler.h"
 #include "StringUtils.h"
 
+#ifdef USE_PROFILER
 static const uint32_t nice_colors[] = {
 	0xFF8040,
 	0x80FF40,
@@ -47,6 +48,7 @@ static const uint32_t nice_colors[] = {
 	0xF8F8F8,
 	0x33FFFF,
 };
+#endif
 
 enum ProfileCatStatus {
 	PROFILE_CAT_VISIBLE = 0,