Merge "Explicitly set X and Y values when offsetting split tasks" into sc-v2-dev