Merge "Correct exiting pip animation state." into pi-dev
am: 87b4c772a5

Change-Id: Ia6bd8813848662ba8da9047d0c47c028265057e4