Merge "Fix MessagingStyle parceling" into nyc-dev