Merge "Revert "Add path to allow task to replace Pipped task without breaking split"" into 24D1-dev