Merge "Fix SettingsHomepageActivityTest failed" into main