Merge "Reverting: "Animating the drag view scale up and down when dragging items.""