Merge "Fix bad one-line MessagingStyle" into nyc-dev