Merge "Avoid some more layer creations" into lmp-dev