Merge "MessagingStyle: Fix buggy measure in MessagingLinearLayout am: 4749930c37 am: c0f4f0a1dc"