Merge "2/ Do not access SettingProvider in test code" into sc-dev