Merge "Resolve test failure in WorkModePreferenceControllerTest"