Merge branch 'Dev-Branch' into wjc

wjc

2023-07-26 80075a89316729927db0ad65ca7674f81a942a93

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs

@@ -629,7 +629,7 @@
                        {
                            Y = btnResidenceManageIcon.Bottom,
                            Height = Application.GetRealHeight(29),
                            TextID = StringId.CombinedDimming,
                            TextID = StringId.GroupControl,
                            TextAlignment = TextAlignment.Center,
                            TextColor = CSS_Color.FirstLevelTitleColor,
                            TextSize = CSS_FontSize.PromptFontSize_FirstLevel,