Merge "Preserve the leash reference in PipTaskOrganizer" into udc-dev