Merge "Fix taskbar being empty" into sc-v2-dev