Merge "Add async register/unregister APIs in Settings/UserSettingsProxy." into main