Merge cleanup

Author: keveleigh

Assets/MRTK/Core/Attributes/MixedRealityControllerAttribute.cs

@@ -44,7 +44,7 @@ public class MixedRealityControllerAttribute : Attribute
         public SupportedUnityXRPipelines SupportedUnityXRPipelines { get; }
 
         /// <summary>
-        /// 
+        /// Constructor.
         /// </summary>
         public MixedRealityControllerAttribute(
             SupportedControllerType supportedControllerType,

Assets/MRTK/Core/Definitions/InputSystem/MixedRealityInputSystemProfile.cs

@@ -137,7 +137,7 @@ public MixedRealityGesturesProfile GesturesProfile
         /// <summary>
         /// The list of cultures where speech recognition is supported
         /// </summary>
-        private static readonly List<CultureInfo> SupportedVoiceCultures = new List<CultureInfo>
+        private List<CultureInfo> supportedVoiceCultures = new List<CultureInfo>
         {
             new CultureInfo("en-US"),
             new CultureInfo("en-CA"),
@@ -155,7 +155,7 @@ public MixedRealityGesturesProfile GesturesProfile
         /// <summary>
         /// Returns whether speech is supported for the current language or not
         /// </summary>
-        public bool IsSpeechSupported => SupportedVoiceCultures.Contains(CultureInfo.CurrentUICulture);
+        public bool IsSpeechSupported => supportedVoiceCultures.Contains(CultureInfo.CurrentUICulture);
 
         [SerializeField]
         [Tooltip("Speech Command profile for wiring up Voice Input to Actions.")]

Assets/MRTK/Core/Definitions/MixedRealityToolkitConfigurationProfile.cs

@@ -138,12 +138,12 @@ public bool IsBoundarySystemEnabled
         [SerializeField]
         [Tooltip("Boundary system class to instantiate at runtime for legacy XR.")]
         [Implements(typeof(IMixedRealityBoundarySystem), TypeGrouping.ByNamespaceFlat)]
-        private SystemType boundarySystemType;
+        private SystemType boundarySystemType = null;
 
         [SerializeField]
         [Tooltip("Boundary system class to instantiate at runtime for XR SDK.")]
         [Implements(typeof(IMixedRealityBoundarySystem), TypeGrouping.ByNamespaceFlat)]
-        private SystemType xrsdkBoundarySystemType;
+        private SystemType xrsdkBoundarySystemType = null;
 
         /// <summary>
         /// Boundary system class to instantiate at runtime.

Assets/MRTK/Core/Services/BaseDataProviderAccessCoreSystem.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using Microsoft.MixedReality.Toolkit.Utilities;
-using Microsoft.MixedReality.Toolkit.Utilities.Editor;
 using System;
 using System.Collections.Generic;
 using Unity.Profiling;