Merge "Improve how LockSettingsService cleans up stale user"