Merge "Prevent Taskbar all apps from showing multi instance options" into main