Merge branch 'stabilization/2106' into mbalfour/gitflow_210622

# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp

Code/Framework/AzCore/AzCore/Asset/AssetTypeInfoBus.h

@@ -57,7 +57,13 @@ namespace AZ
         //! Determines if a component can be created from the asset type
         //! This will be called before attempting to create a component from an asset (drag&drop, etc)
         //! You can use this to filter by subIds or do your own validation here if needed
-        virtual bool CanCreateComponent(const AZ::Data::AssetId& /*assetId*/) const { return true; }
+        virtual bool CanCreateComponent([[maybe_unused]] const AZ::Data::AssetId& assetId) const { return true; }
+
+        //! Determines if other products conflict with the given one when multiple are generated from a source asset.
+        //! This will be called before attempting to create a component from an asset (drag&drop, etc)
+        //! You can use this to filter by conflicting product types or in case you want to skip for UX reasons.
+        //! @param[in] productAssetTypes Asset types of all generated products, including the one for our given type in this bus.
+        virtual bool HasConflictingProducts([[maybe_unused]] const AZStd::vector<AZ::Data::AssetType>& productAssetTypes) const { return false; }
     };
 
     using AssetTypeInfoBus = AZ::EBus<AssetTypeInfo>;

Code/Framework/AzCore/Tests/Serialization/Json/JsonSerializerConformityTests.h

@@ -1206,7 +1206,7 @@ namespace JsonSerializationTests
         if (this->m_features.m_enableInitializationTest)
         {
             auto instance = this->m_description.CreateDefaultInstance();
-            typename TypeParam::Type compare;
+            AZStd::remove_cvref_t<typename TypeParam::Type> compare;
             if (!this->m_description.AreEqual(*instance, compare))
             {
                 auto serializer = this->m_description.CreateSerializer();