Merge "Add MessagingStyle transitions" into nyc-dev