Merge "Move SettingsActivityTest to multivalent" into main