Merge "[SettingsProvider] specify settings type in the comments" into sc-dev