Merge "Small tweaks in LockSettingsService"