Merge "Improve selection of dead key accent chars."