Merge "Fixes ScreenTimeoutSettingsTest" into sc-dev