Don't create a layer if we're the master object.
Migrate to layered rendering
Switch to new layered interface