Merge "Bug 5237623: word no longer underlined after replacement"