Merge branch 'development' into Prefab/SaveAllPrefabs

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityHelpers.cpp

@@ -1324,7 +1324,7 @@ namespace AzToolsFramework
             AZ::SliceComponent::EntityAncestorList::const_iterator ancestorIter = ancestors.begin();
             // Skip the first, that would be a regular slice root and not a subslice root, which was already checked.
             ++ancestorIter;
-            for (ancestorIter; ancestorIter != ancestors.end(); ++ancestorIter)
+            for (; ancestorIter != ancestors.end(); ++ancestorIter)
             {
                 const AZ::SliceComponent::Ancestor& ancestor = *ancestorIter;
                 if (!ancestor.m_entity || !SliceUtilities::IsRootEntity(*ancestor.m_entity))

Code/Framework/AzToolsFramework/AzToolsFramework/Entity/SliceEditorEntityOwnershipService.cpp

@@ -98,7 +98,6 @@ namespace AzToolsFramework
     void SliceEditorEntityOwnershipService::OnSlicePreInstantiate(const AZ::Data::AssetId& sliceAssetId, const AZ::SliceComponent::SliceInstanceAddress& sliceAddress)
     {
         AZ_PROFILE_FUNCTION(AzToolsFramework);
-        const AzFramework::SliceInstantiationTicket ticket = *AzFramework::SliceInstantiationResultBus::GetCurrentBusId();
 
         // Start an undo that will wrap the entire slice instantiation event (unable to do this at a higher level since this is queued up by AzFramework and there's no undo concept at that level)
         ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::Bus::Events::BeginUndoBatch, "Slice Instantiation");