Merge "Fix window move animation duration scale"