am f9ed8be1: (-s ours) am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after being detached" into jb-mr2-dev

* commit 'f9ed8be17da47f5003205bf1fbfc87a300de10f0':
  DO NOT MERGE: Don't crash when we get a drag-ended after being detached