Merge "Use new theme style to fit new design of Setup Wizard" into sc-dev