Merge "Delete dead test SettingsActivityTest" into main