am 8aed171c: am 33bbbb0d: am de674ac0: Re-activate emoji keyboard shortcut.

* commit '8aed171ccb0a081a9dc12ed2942ac7e6d2f6788d':
  Re-activate emoji keyboard shortcut.