Merge "Revert "[SettingsProvider] use per-prefix caches for Config.getStrings queries"" into main