Merge "[SettingsProvider] do not crash the system if config settings files are broken" into udc-qpr-dev