Bug 927286: Change keyboard word suggestions so we never display the user's actual input and instead have an X icon to dismiss the suggestions and prevent autocorrection

address review comments

update tests to match new word suggestions behavior

fix merge conflict with bug 929361
Merge pull request #14381 from davidflanagan/bug927286

Bug 927286: Change keyboard word suggestions so we never display the use...