Merge branch 'master' into XRSDK_Phone

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

Samples~/SDK/Common/StandardAssets/Materials/font_color_black_keyboard.mat

@@ -2,15 +2,20 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: font_color_black_keyboard
   m_Shader: {fileID: 4800000, guid: bd4bca08cf76f214db79e7777113d146, type: 3}
-  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _ALPHAPREMULTIPLY_ON _EMISSION _GLOSSYREFLECTIONS_OFF
-    _SPECULARHIGHLIGHTS_OFF
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - ETC1_EXTERNAL_ALPHA
+  - _ALPHAPREMULTIPLY_ON
+  - _EMISSION
+  - _GLOSSYREFLECTIONS_OFF
+  - _SPECULARHIGHLIGHTS_OFF
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -64,6 +69,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BumpScale: 1
     - _Cutoff: 0.5
@@ -90,7 +96,8 @@ Material:
     - _UVSec: 0
     - _ZWrite: 0
     m_Colors:
-    - _Color: {r: 0.7924528, g: 0.7924528, b: 0.7924528, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _Emission: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 1, g: 0.67428774, b: 0, a: 1}
     - _SpecColor: {r: 1, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

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;
                 }