Merge "Increase taskbar size to match latest specs" into sc-dev