Merge "Revert "Make PipTaskOrganizer protected."" into rvc-dev