Merge "Made the old MessagingLayout work again" into rvc-dev