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

* commit 'a853c62323cef84ffc8442e0d1f6550ee7b1f99e':
  Avoid some more layer creations