Merge "Layer changes" into lmp-mr1-dev