Merge "Prevent 3 button taskbar from showing on startup" into sc-dev