Merge "Fix failed tests on ResetPreferenceControllerTest"