Merge "Fixes a visual issue with the Messaging Layout" into pi-dev