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