Merge "Added SearchIndexProvider for UserSettings" into mnc-dev