Merge "Adds support for MessagingStyle in the Compat lib" into nyc-dev