Merge "Removing a workaround for incorrect window position on window move."