Merge "Fix RemoveAccountPreferenceControllerTest"