am f9ed8be1: (-s ours) am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we...
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 'f9ed8be1':
DO NOT MERGE: Don't crash when we get a drag-ended after being detached