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