Merge "Bug 5255124: Move cursor to the end of a word after correction popup alternates selection"