Merge "Clean up drag-n-drop." into nyc-dev