Merge "Add search index provider for ConfigureNotificationSettings" into oc-dev