Merge main into feature/XRI3 (#1098)

Author: keveleigh

.github/workflows/pr_labeler.yaml

@@ -11,7 +11,7 @@ jobs:
   label-pr:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v8
         with:
           script: |
             if (context.payload.pull_request.base.ref == 'feature/XRI3')

.github/workflows/validation_mrtk3.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
 
     - name: Get Pull Request changes
       if: github.event_name == 'pull_request'

org.mixedrealitytoolkit.input/InteractionModes/InteractionModeManager.cs

@@ -319,6 +319,17 @@ private void Awake()
             InitializeInteractionModeDetectors();
         }
 
+        /// <summary>
+        /// A Unity event function that is called when the script component has been destroyed.
+        /// </summary>
+        private void OnDestroy()
+        {
+            if (InteractionManager != null)
+            {
+                InteractionManager.interactorRegistered -= OnInteractorRegistered;
+            }
+        }
+
         /// <summary>
         /// A Unity Editor only event function that is called when the script is loaded or a value changes in the Unity Inspector.
         /// </summary>

org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsCalculator.cs

@@ -100,6 +100,8 @@ internal static Bounds CalculateBounds(
                 finalBounds.Encapsulate(root.InverseTransformPoint(totalBoundsCorners[i]));
             }
 
+            totalBoundsCorners.Clear();
+            childTransforms.Clear(); // Avoid keeping reference to Unity objects to avoid "Leaked Memory Shell"
             return finalBounds;
         }
 

org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs

@@ -164,6 +164,19 @@ protected override void OnDisable()
             }
         }
 
+        /// <summary>
+        /// A Unity event function that is called when the script component has been destroyed.
+        /// </summary>
+        protected override void OnDestroy()
+        {
+            base.OnDestroy();
+            if (InteractionManager != null)
+            {
+                InteractionManager.interactorRegistered -= OnInteractorRegistered;
+                InteractionManager.interactorUnregistered -= OnInteractorUnregistered;
+            }
+        }
+
         /// <summary>
         /// Called when a an <see cref="IXRInteractor"/> is registered with a Unity <see cref="XRInteractionManager"/>.
         /// </summary>