Merge "Fix relaunch of freeform tasks outside desktop" into main