Merge "Fix TV PiP back and forth animation after switch"