Merge "Directly dispatch USER_REMOVED to LockSettingsService"