Merge "Fix Desktop Windowing focus if clicked in Taskbar" into main