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