Merge "Revert "Skip finishResize for non-exit animation if PIP is about to exit"" into sc-dev