Merge "WindowManagerService not propagating X and Y steps"