Merge "Remove virtual from ~ComposerClientWriter"