am b0b815da: Merge change 5845 into donut

Merge commit 'b0b815da8c487bbfac6b2eadc91c619682720a71'

* commit 'b0b815da8c487bbfac6b2eadc91c619682720a71':
  Always clear the TextView drag state whenever a touch begins.