Merge "Use pinned taskbar with desktop tasks on freeform displays" into main