Remove some duplication in compositing
Merge pull request #2887 from arielb1/remove-compositing-layout

Clean up duplication in Pipeline