Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev