Merge "Correct exiting pip animation state." into pi-dev