Merge "Fixed the RTL appearance of messagingStyle" into pi-dev
am: 7a86424275

Change-Id: I1bfb6f11faed88cedccced1a5863511f7c72b45c