Merge "Fix pip expand issue if parent task under split root" into tm-qpr-dev