Merge "Make pip test clearing custom actions reliable"