Merge "Tweaks to DragAndDropPermissions behavior" into nyc-dev