Merge "Don't stomp on the drag-focus bookkeeping inadvertently."