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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/Device/Room/RoomManagement.cs

@@ -173,7 +173,7 @@
        }

        /// <summary>
        /// 
        ///
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="mouseEventArgs"></param>