Merge "Fix PiP animation errors introduced in crop refactoring."