Merge "Fix regression where nav bar shows when taskbar is showing" into sc-v2-dev