Merge "Add tests for HibernatedAppsPreferenceControllerTest" into sc-dev