Merge branch 'development' of https://github.com/aws-lumberyard/o3de into Neil_P0_updates

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp

@@ -783,6 +783,7 @@ namespace AzToolsFramework
             }
 
             EBUS_EVENT(ToolsApplicationEvents::Bus, InvalidatePropertyDisplay, Refresh_EntireTree);
+            ToolsApplicationRequests::Bus::Broadcast(&ToolsApplicationRequests::Bus::Events::AddDirtyEntity, GetEntityId());
         }
 
         void ScriptEditorComponent::LoadProperties()

Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp

@@ -712,6 +712,7 @@ namespace ScriptCanvasEditor
         bool rollbackRequired = false;
         nodeEntity->Deactivate();
         RemoveNode(oldNode->GetEntityId());
+
         nodeEntity->RemoveComponent(oldNode);
 
         nodeEntity->AddComponent(newNode);