Merge branch 'development' into cmake/SPEC-7182

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/QtUtil.h
#	Code/Legacy/CryCommon/Linux_Win32Wrapper.h
#	Code/Legacy/CryCommon/ProjectDefines.h
#	Code/Legacy/CryCommon/StringUtils.h
#	Code/Legacy/CryCommon/UnicodeBinding.h
#	Code/Legacy/CryCommon/UnicodeEncoding.h
#	Code/Legacy/CryCommon/UnicodeFunctions.h
#	Code/Legacy/CryCommon/UnicodeIterator.h
#	Code/Legacy/CryCommon/WinBase.cpp
#	Code/Legacy/CryCommon/platform.h
#	Code/Legacy/CryCommon/platform_impl.cpp
#	Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
#	Gems/Maestro/Code/Source/Cinematics/Movie.cpp

Code/Editor/Plugins/EditorAssetImporter/AssetImporterPlugin.h

@@ -41,7 +41,7 @@ public:
         return m_editor;
     }
 
-    const string& GetToolName() const
+    const AZStd::string& GetToolName() const
     {
         return m_toolName;
     }
@@ -88,7 +88,7 @@ private:
     IEditor* const m_editor;
 
     // Tool name
-    string m_toolName;
+    AZStd::string m_toolName;
 
     // Context provider for the Asset Browser
     AZ::AssetBrowserContextProvider m_assetBrowserContextProvider;

Code/Editor/Plugins/EditorCommon/DrawingPrimitives/Ruler.cpp

@@ -12,6 +12,7 @@
 #include <QPainter>
 #include <QPalette>
 #include <AzCore/Casting/numeric_cast.h>
+#include <AzCore/std/algorithm.h>
 
 namespace DrawingPrimitives
 {

Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.cpp

@@ -8,8 +8,6 @@
 
 
 #include "FFMPEGPlugin.h"
-#include "CryString.h"
-typedef CryStringT<char> string;
 #include "Include/ICommandManager.h"
 #include "Util/PathUtil.h"
 

Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp

@@ -8,6 +8,7 @@
 
 #include "ProjectSettingsContainer.h"
 
+#include <AzCore/IO/SystemFile.h>
 #include <AzCore/JSON/prettywriter.h>
 #include <AzCore/JSON/stringbuffer.h>
 #include <AzCore/XML/rapidxml_print.h>