Merge "Camera: Switch EFV public API flag" into main