Merge "First pass at Taskbar layout UI polish for SUW" into tm-qpr-dev