Merge "Add SettingsXmlIndexProvider for search indexing"