Merge "Fix some places that inadvertently removed split root tasks"