Merge "Fix PiP regression when the stack animation is canceled" into pi-dev
am: 19cfc1a754

Change-Id: I4a4a0edb7931770b1c36dff87397667592e4db19