Merge "Fix for "Can't place cursor after combining accent"" into klp-dev