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

* commit '33bbbb0d333223451eb24d6b462840755fb51152':
  Re-activate emoji keyboard shortcut.