Merge "Ensure Desktop Tasks show up in Taskbar multi instance menu" into main