Merge pull request #10624 from keveleigh/2.8.1-cherry-picks

2.8.1 cherry-picks from main

Author: keveleigh

Assets/MRTK/SDK/Features/Input/Handlers/ObjectManipulator.cs

@@ -577,6 +577,8 @@ public Vector3 GetPointerGrabPoint(uint pointerId)
         public virtual void OnPointerDown(MixedRealityPointerEventData eventData)
         {
             if (eventData.used ||
+                    eventData.Pointer == null ||
+                    eventData.Pointer.Result == null ||
                     (!allowFarManipulation && eventData.Pointer as IMixedRealityNearPointer == null))
             {
                 return;

Assets/MRTK/SDK/Features/UX/Scripts/Slate/FollowMeToggle.cs

@@ -183,6 +183,11 @@ private void OnEnable()
             // Begin the follow coroutine when enabled.
             AutoFollowAtDistance = autoFollowAtDistance;
         }
+        
+        private void OnDisable()
+        {
+            autoFollowDistanceCheck = null;
+        }
 
         #endregion MonoBehaviour Implementation