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