Merge "[SettingsProvider] minor refactor: use a separate lock for GenerationRegistry" into main