Merge "Remove dead taskbar code" into sc-dev