Merge "Made the old MessagingLayout work again" into rvc-dev am: 62ee4e97 am: 269e95c7 am: 0e6121d7 am: 611684f7 Change-Id: Ia836a762145b8461ae7e0ec2e3f304afe26a7055