Merge "Remove circular ref from MessagingLinearLayout" into rvc-dev