Merge change If1f0bf33 into eclair

* changes:
  Some work on issue #2286804: sometimes text field doesn't accept input