Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev