Merge "[SettingsProvider] minor refactor before lock changes" into main