Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs

Assets/Scripts/Scenes/MainController.cs

@@ -33,6 +33,7 @@ public class MainController : BaseScene
         //transform.Find("ModalPanel").GetComponent<RectTransform>().sizeDelta = new Vector2(844, 390);
 #endif
         App.MainDeviceAdapter.StartScan();
+#endif
     }
 
     // Start is called before the first frame update