Merge "[SettingsProvider] fix mock leakage in NameValueCacheTest" into main