Merge "Taskbar in Desktop Windowing Mode" into main