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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/Login/AccountResetPWDSuccess.cs

@@ -95,7 +95,7 @@
                }
                finally
                {
                    var login = new AccountLogin();
                    var login = new AccountLoginForm();
                    CommonPage.Instance.AddChidren(login);
                    login.ShowForm();
                }