am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev

* commit 'ac6d0c656e1788d796c3c78434ceb049b43abb42':
  Fix a bug where emojis would remove the suggestion strip.