Merge "Determine split leash position by taskId instead of bounds" into main