Merge "[SettingsProvider] Fix user id for ringtone cache"