Merge "ignore drop position when dragging items to small screens"