Merge "Fix taskbar layout issues in setup wizard" into sc-v2-dev