Merge changes I20e4aa1a,I00370f05

* changes:
  SF: Introduce LayerCompositionState
  SF: Introduce OutputLayerCompositionState