Merge "Fix delete handling in Emoji keyboard."