Merge "Fix null pointer when dragging outside of workspace."