am 7112d5db: Merge "Do not defer removing the drag view if we don\'t animate the item back into the folder. (Bug 6249514)" into jb-dev

* commit '7112d5dbdf1861227499ecb509b1a12343215f92':
  Do not defer removing the drag view if we don't animate the item back into the folder. (Bug 6249514)