Merge "Make Drag and Drop mouse specific behavior for now."