Merge changes Ia5729aaf,I91584b7d into jb-dev

* changes:
  Remove selection highlight when replacing/deleting.
  Don't do character add/delete when there is a selection.