FIx leaky listeners

This is for #9418 
I don't think this comment is quite right. Item was dragged, but it wasn't moved (i.e. dropped in same position), right?