Merge "Override bidi property of new emojis" into oc-dev