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

* commit '7c1b10872f3d57b3afdb0f070fcf602e4d72df37':
  Fix for "Can't place cursor after combining accent"