Merge "Fix LockSettingsServiceTest"