Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev