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

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