Merge "Put safeguard in dismissPip" into rvc-dev