Merge "[SettingsProvider] update ringtone cache only after setting is update" into udc-qpr-dev