Merge change 4359

* changes:
  Allow proper text editing after clicking with the trackball.