Merge "Emoji Compat 2019"