Mod compositor consolidate shell surfaces

Targets #538.