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

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

old mode 100755
new mode 100644
@@ -18,7 +18,8 @@
            TextID = R.MyInternationalizationString.Edit;
            TextColor = ZigbeeColor.Current.GXCTextWhiteColor;
            TextAlignment = TextAlignment.Center;
            Radius = CommonPage.BigFormRadius;
            TextSize = 14;
            //Radius = CommonPage.BigFormRadius;
        }
    }
}