Merge "[SettingsProvider] properly clear stale GenerationTracker for Settings.Config" into main