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