am 12618bf7: am 7c1b1087: Merge "Fix for "Can\'t place cursor after combining accent"" into klp-dev

* commit '12618bf7f58ec7a23c6e25db1eec41332727edf8':
  Fix for "Can't place cursor after combining accent"