am e498ab99: Merge change 24807 into eclair

Merge commit 'e498ab9986cf0d3f2d7bc1511d80134427ad2303'

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