Merge "Consider root task offset when updating split bounds"