Merge "Added check for forceClientComposition for every layer."