Integrating github/staging through commit 5f214be

Code/Sandbox/Editor/TrackView/TrackViewDialog.cpp

@@ -1870,7 +1870,7 @@ void CTrackViewDialog::ReadMiscSettings()
 //////////////////////////////////////////////////////////////////////////
 void CTrackViewDialog::SaveLayouts()
 {
-    QSettings settings("Amazon", "Lumberyard");
+    QSettings settings("Amazon", "O3DE");
     settings.beginGroup("TrackView");
     QByteArray stateData = this->saveState();
     settings.setValue("layout", stateData);
@@ -1886,7 +1886,7 @@ void CTrackViewDialog::SaveLayouts()
 //////////////////////////////////////////////////////////////////////////
 void CTrackViewDialog::ReadLayouts()
 {
-    QSettings settings("Amazon", "Lumberyard");
+    QSettings settings("Amazon", "O3DE");
     settings.beginGroup("TrackView");
 
     setViewMode(static_cast<ViewMode>(settings.value("lastViewMode").toInt()));

Code/Sandbox/Editor/TrackView/TrackViewPythonFuncs.cpp

@@ -481,8 +481,6 @@ namespace
         default:
             throw std::runtime_error("Unsupported key type");
         }
-
-        return AZStd::any();
     }
 
     AZStd::any PyTrackViewGetKeyValue(const char* paramName, int trackIndex, int keyIndex, const char* nodeName, const char* parentDirectorName)