Merge "Fix XML parsing crash in SettingsProvider"