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