Merge "Fix resource problem in SettingsSliderPreferenceControllerTest" into sc-dev