Merge "Adds explanation of MessagingStyle fields" into tm-dev