Merge "Fix for NPE in ScreenTimeoutSettingsTest" into sc-dev