Merge "Fix window movement animations"