Merge "SF: Introduce LayerFE::prepareClientComposition"