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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/Device/Light/AirSwitchControl.cs

@@ -157,8 +157,8 @@
        public override void RemoveFromParent()
        {
            ZbGateway.StatusList.Remove(this);
            action();
            action = null;
            //action();
            //action = null;
            RemoveUpdateControlDeviceStatuAction();
            base.RemoveFromParent();
        }