am ea5af639: Merge "Re-jigger layers" into lmp-preview-dev

* commit 'ea5af63965bf323580aa1e2854efb2f8cc3dc396':
  Re-jigger layers