Merge remote-tracking branch 'upstream/prerelease/2.5.1_upm_stabilization' into shaderImport

Author: davidkline-ms

Assets/MRTK/Core/Extensions/TypeExtensions.cs

@@ -27,7 +27,7 @@ public static List<Type> GetAllSubClassesOf(this Type rootType, Assembly[] searc
 
             Parallel.ForEach(searchAssemblies, (assembly) =>
             {
-                Parallel.ForEach(assembly.GetTypes(), (type) =>
+                Parallel.ForEach(assembly.GetLoadableTypes(), (type) =>
                 {
                     if (type != null && type.IsClass && !type.IsAbstract && type.IsSubclassOf(rootType))
                     {

Assets/MRTK/Core/Inspectors/Profiles/DataProviderAccessServiceInspector.cs

@@ -167,6 +167,7 @@ protected bool RenderDataProviderEntry(int index, GUIContent removeContent, Syst
             {
                 using (new EditorGUILayout.HorizontalScope())
                 {
+                    if (index < 0 || index >= providerFoldouts.Count) index = 0;
                     providerFoldouts[index] = EditorGUILayout.Foldout(providerFoldouts[index], providerProperties.componentName.stringValue, true);
 
                     if (GUILayout.Button(removeContent, EditorStyles.miniButtonRight, GUILayout.Width(24f)))