Merge "Migrate ChooseNewAdminPreferenceControllerTest" into sc-dev