Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs

@@ -416,7 +416,6 @@
                        curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
                    }
                    curRoom = room;
                    currentKey.RoomId = room.Id;
                    RefreshDeviceList(curRoom);
                    if (curTypeDeviceList.Count == 0)
                    {