Merge "Use task position for transition in freeform mode"