Merge "Camera: Fix lint errors added by EFV APIs" into main