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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Phone/Device/Category/SelectFloor.cs

@@ -60,10 +60,6 @@
                TextID = R.MyInternationalizationString.SelectFloor
            };
            backgroundFL.AddChidren(tip);
            tip.MouseUpEventHandler += (sender, e) =>
            {
                BackgroundColor = ZigbeeColor.Current.GXCRedColor;
            };

            var floorLayout = new VerticalScrolViewLayout
            {