Merge "Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout" into nyc-mr2-dev am: ae5d4ff831 am: 8d2ffaefaa"