Merge "Early return for task-start-position-only change" into main