Merge "Fix EmojiTest threading issue." into jb-mr2-dev