am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after...
am 8edd7849: Merge "DO NOT MERGE: Don\'t crash when we get a drag-ended after being detached" into jb-mr2-dev
* commit '8edd7849':
DO NOT MERGE: Don't crash when we get a drag-ended after being detached