Merge "Two Taskbar Bug" into main