Merge "Fix some issues with taskbar" into sc-dev