Fix more dnd regressions, put dnd grip calculation back to it's original,
"mtwebster hasn't messed with it" state
DnD: Fix items sometimes becoming unresponsive to drag
Merge pull request #1959 from mtwebster/i-hate-dnd

Fix more dnd regressions, put dnd grip calculation back to it's original, "mtwebster hasn't messed with it" state