Merge "Reset pip actions when pip disappears"