Merge "Add unit tests for LockSettingsService"