Merge "Fixed an issue where the messaging layout could appear empty" into pi-dev
am: 1e543887f5

Change-Id: I0bfda0c9b5700f5d1d27133b0ac9b7d8640d4e60