Merge change 5845 into donut

* changes:
  Always clear the TextView drag state whenever a touch begins.