Merge "More test for taskbar overflow" into main