am bf3706f0: am 83acc755: Merge "Clear the draginfo object once the item is dropped inside a folder" into ub-now-porkchop

* commit 'bf3706f01e9a1a6c167f39c744ff4001e325c7fa':
  Clear the draginfo object once the item is dropped inside a folder