Merge "Fix layout for the messaging sample" into lmp-docs