Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev