Merge "Fix Emoji key feedback"