Merge "WM: Fix seamless rotation when multiple windows are drawn"