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