Merge "[SettingsProvider] Auto disable ringtone sync"