Merge "WindowManagerService not propagating X and Y steps" into mnc-dev