Merge "Fix taskbar visibility when default-to-desktop" into main