am c514d3ea: Merge "Fix Emoji key feedback"

* commit 'c514d3ead2bea8e067a3efb9cfc7bea3b0226294':
  Fix Emoji key feedback