Merge "Using the new bidi unicode wrapping now for messaging style" into nyc-mr1-dev