DF-2339 - Updated drag'n'drop functionality
Removed unneeded comment.
Merge branch 'upstream/development'
Merge branch 'upstream/DF-2339-Drag_n_Drop'