Merge "Fix LockSettingsService unit test long wait"