Merge "Camera: fix codegen"