am bc6542cc: Merge "Remove a few unnecessary withLayer() calls" into lmp-dev

* commit 'bc6542cca228440c6ca29fe038a2cf98e1b47fd5':
  Remove a few unnecessary withLayer() calls