Merge "Fixes a visual issue with the Messaging Layout" into pi-dev am: 8e4b8ea38a
am: f0f0746747

Change-Id: I93da4f1495f292b831ca66098c6c383c02a45007