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

Change-Id: I8982a851a99bc6843849667df049162c1e381ef4