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