Merge "Avoid recursion for leaf task fragment in freeform mode" into main