Merge change 24807 into eclair

* changes:
  Fix a drag and drop issue: if a drop happened too quickly it could go to the wrong screen.