Merge "CE: Reset forceClientComposition on geometry update"