Merge "Set progressBarHorizontal style in Theme.SettingsBase" into sc-dev