Merge branch 'master' into XRSDK_A01

# Conflicts:
#	Samples~/SDK/Modules/Module_GridCollection/Scripts/SCGridLayoutGroup.cs

Samples~/SDK/Modules/Module_GridCollection/Scripts/SCGridLayoutGroup.cs

@@ -97,7 +97,7 @@ namespace SC.XR.Unity
             get { return rows; }
             set
             {
-                if (LayoutType == LayoutTypes.Horizontal)
+                if (LayoutType == LayoutTypes.Horizontal) 
                 {
                     return;
                 }