Merge "Fix compatibility in MessagingStyle."