Merge "Adds the validator adaptive_sleep back to SystemSettingsValidators"