Merge changes I28ac9a2d,I8ecc88b6 into sc-dev

* changes:
  WindowStateAnimator: Move HScale/VScale application to WindowState
  WinodowStateAnimator: Remove mD(s|t)d(x|y)