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