Merge "Zero out DragEvent position when it should not be available"