Merge "Revert "Fix Emoji key feedback""