Merge "Taskbar layout update" into sc-v2-dev