Merge "Fix HibernationSwitchPreferenceControllerTest" into sc-dev