Merge "Fix error recovery when a drag can't be started"