Merge branch 'LYN-3510' of https://github.com/aws-lumberyard-dev/o3de into LYN-3510

Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.cpp

@@ -25,6 +25,22 @@ namespace ${SanitizedCppName}
         }
     }
 
+    ${SanitizedCppName}EditorSystemComponent::${SanitizedCppName}EditorSystemComponent()
+    {
+        if (${SanitizedCppName}Interface::Get() == nullptr)
+        {
+            ${SanitizedCppName}Interface::Register(this);
+        }
+    }
+
+    ${SanitizedCppName}EditorSystemComponent::~${SanitizedCppName}EditorSystemComponent()
+    {
+        if (${SanitizedCppName}Interface::Get() == this)
+        {
+            ${SanitizedCppName}Interface::Unregister(this);
+        }
+    }
+
     void ${SanitizedCppName}EditorSystemComponent::Activate()
     {
         AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();

Templates/DefaultGem/Template/Code/Source/${Name}EditorSystemComponent.h

@@ -29,7 +29,8 @@ namespace ${SanitizedCppName}
         AZ_COMPONENT(${SanitizedCppName}EditorSystemComponent, "${EditorSysCompClassId}");
         static void Reflect(AZ::ReflectContext* context);
 
-        ${SanitizedCppName}EditorSystemComponent() = default;
+        ${SanitizedCppName}EditorSystemComponent();
+        ~${SanitizedCppName}EditorSystemComponent();
 
     private:
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)

Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.cpp

@@ -59,6 +59,22 @@ namespace ${SanitizedCppName}
         AZ_UNUSED(dependent);
     }
 
+    ${SanitizedCppName}SystemComponent::${SanitizedCppName}SystemComponent()
+    {
+        if (${SanitizedCppName}Interface::Get() == nullptr)
+        {
+            ${SanitizedCppName}Interface::Register(this);
+        }
+    }
+
+    ${SanitizedCppName}SystemComponent::~${SanitizedCppName}SystemComponent()
+    {
+        if (${SanitizedCppName}Interface::Get() == this)
+        {
+            ${SanitizedCppName}Interface::Unregister(this);
+        }
+    }
+
     void ${SanitizedCppName}SystemComponent::Init()
     {
     }

Templates/DefaultGem/Template/Code/Source/${Name}SystemComponent.h

@@ -35,6 +35,9 @@ namespace ${SanitizedCppName}
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
         static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
 
+        ${SanitizedCppName}SystemComponent();
+        ~${SanitizedCppName}SystemComponent();
+
     protected:
         ////////////////////////////////////////////////////////////////////////
         // ${SanitizedCppName}RequestBus interface implementation

Templates/DefaultProject/Template/Code/Source/${Name}SystemComponent.cpp

@@ -66,7 +66,7 @@ namespace ${SanitizedCppName}
             ${SanitizedCppName}Interface::Register(this);
         }
     }
-    
+
     ${SanitizedCppName}SystemComponent::~${SanitizedCppName}SystemComponent()
     {
         if (${SanitizedCppName}Interface::Get() == this)