Merge "Put safeguard in dismissPip" into rvc-dev am: 114b422d6d am: 169b4c5c54

Change-Id: I45010ce3f059aa4739145af2508fe2dfc560d798