Merge "Correct layer size formatting in trace" into lmp-mr1-dev