am 39538cd0: am a853c623: Merge "Avoid some more layer creations" into lmp-dev

* commit '39538cd0088de2bdc5101a9d69e3e8f25d5fcb3b':
  Avoid some more layer creations