am ede88a3b: Merge "Revert "Fix Emoji key feedback""

* commit 'ede88a3bd66c172e15d3dc812191cc1771a0f338':
  Revert "Fix Emoji key feedback"