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