am 08afec7f: Merge "Move cursor to the right place when adding phonetic name"

* commit '08afec7f1251b6a337eda32762afd023fbe2ec95':
  Move cursor to the right place when adding phonetic name