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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserView/SafetyShortcutControl.cs

@@ -127,10 +127,10 @@
                        dialog.Close();
                        if(result == GarrisonMode.AtHome)
                        {
                            

                        }
                    });
                    

                })
                { IsBackground = true }.Start();
            };