Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs

@@ -75,6 +75,7 @@
                Radius = (uint)Application.GetRealHeight(17)
            };
            sceneRowLayout.AddChidren(sceneImg);
            //sceneImg.SetViewShadow(true);

            var leftFL = new FrameLayout
            {