Merge "Re-jigger layers" into lmp-preview-dev