Merge branch 'main' into Prefab/RelativePathForNewPrefabs

Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp

@@ -617,9 +617,9 @@ namespace AzFramework
             // won't free the mutex until the load is complete.
             // So instead, queue the notification until the next tick, so that it doesn't occur within the AssetCatalogRequestBus mutex, and also
             // so that the entire AssetCatalog initialization is complete.
-            AZ::TickBus::QueueFunction([catalogRegistryFile]()
+            AZ::TickBus::QueueFunction([catalogRegistryString = AZStd::string(catalogRegistryFile)]()
                 {
-                    AssetCatalogEventBus::Broadcast(&AssetCatalogEventBus::Events::OnCatalogLoaded, catalogRegistryFile);
+                    AssetCatalogEventBus::Broadcast(&AssetCatalogEventBus::Events::OnCatalogLoaded, catalogRegistryString.c_str());
                 });
         }
     }

Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp

@@ -65,7 +65,7 @@ namespace AzToolsFramework
 
                 if (!contextMenu.m_menu->isEmpty())
                 {
-                    contextMenu.m_menu->popup(QCursor::pos());
+                    contextMenu.m_menu->exec(QCursor::pos());
                 }
             }
         }