Merge "Fix bug where dragview gets stuck on screen."