Merge "WM: Fix jumpcut animations"