Merge "Fix PiP regression when the stack animation is canceled" into pi-dev