Merge "SF: Move clearClientTarget to compositionInfo"