Merge "Made the old MessagingLayout work again" into rvc-dev am: 62ee4e97 am: dc7c25e9 am: 47083c84 am: ddc9eea0 Change-Id: I6fcadcad3c61bde44f3fcd6861975efdca72a34e