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

tzy

2021-05-14 ee5f2543624a0e3ae9d046062b822727a31685e1

 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs

@@ -26,6 +26,7 @@
        {
            MainPage.BasePageView.ScrollEnabled = false;
            bodyView = this;
            bodyView.Tag = "unlockpage";
            oldPasswrod = pw;
            backAction = action;
        }