Merge branch 'develop' into LYN-4700

Signed-off-by: igarri <igarri@amazon.com>

Code/Editor/Settings.cpp

@@ -189,6 +189,7 @@ SEditorSettings::SEditorSettings()
 
     consoleBackgroundColorTheme = AzToolsFramework::ConsoleColorTheme::Dark;
     bShowTimeInConsole = false;
+    clearConsoleOnGameModeStart = false;
 
     enableSceneInspector = false;
 
@@ -528,6 +529,8 @@ void SEditorSettings::Save()
 
     SaveValue("Settings", "ConsoleBackgroundColorThemeV2", (int)consoleBackgroundColorTheme);
 
+    SaveValue("Settings", "ClearConsoleOnGameModeStart", clearConsoleOnGameModeStart);
+
     SaveValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
 
     SaveValue("Settings", "EnableSceneInspector", enableSceneInspector);
@@ -747,6 +750,8 @@ void SEditorSettings::Load()
         consoleBackgroundColorTheme = AzToolsFramework::ConsoleColorTheme::Dark;
     }
 
+    LoadValue("Settings", "ClearConsoleOnGameModeStart", clearConsoleOnGameModeStart);
+
     LoadValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
 
     LoadValue("Settings", "EnableSceneInspector", enableSceneInspector);
@@ -1085,7 +1090,7 @@ void SEditorSettings::ConvertPath(const AZStd::string_view sourcePath, AZStd::st
 
 AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::GetValue(const AZStd::string_view path)
 {
-    if (path.find("|") < 0)
+    if (path.find("|") == AZStd::string_view::npos)
     {
         return { AZStd::string("Invalid Path - could not find separator \"|\"") };
     }
@@ -1103,7 +1108,7 @@ AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::Get
 
 AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::SetValue(const AZStd::string_view path, const AZStd::any& value)
 {
-    if (path.find("|") < 0)
+    if (path.find("|") == AZStd::string_view::npos)
     {
         return { AZStd::string("Invalid Path - could not find separator \"|\"") };
     }