Address PR comments.

Signed-off-by: John <jonawals@amazon.com>

Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.cpp

@@ -203,9 +203,10 @@ namespace AzToolsFramework
             }
         }
 
-        const AZStd::vector<AZ::Uuid>& ComponentModeCollection::GetComponentTypes() const
+        AZStd::vector<AZ::Uuid> ComponentModeCollection::GetComponentTypes() const
         {
-            return m_activeComponentTypes;
+            // If in component mode, return the active component types, otherwise return an empty vector
+            return InComponentMode() ? m_activeComponentTypes : AZStd::vector<AZ::Uuid>{};
         }
 
         void ComponentModeCollection::BeginComponentMode()

Code/Framework/AzToolsFramework/AzToolsFramework/ComponentMode/ComponentModeCollection.h

@@ -92,7 +92,7 @@ namespace AzToolsFramework
             void PopulateViewportUi();
 
             // ComponentModeCollectionInterface overrides ...
-            const AZStd::vector<AZ::Uuid>& GetComponentTypes() const override;
+            AZStd::vector<AZ::Uuid> GetComponentTypes() const override;
 
         private:
             // Internal helper used by Select[|Prev|Next]ActiveComponentMode