Merge "Refactor Settings/UserSettingsProxy APIs with 'Sync' suffix." into main