Merge "SF: setCompositionType when Client composition"