Merge "Add drag and drop to VideoViewDemo" into nyc-dev