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