Merge "Camera: Update EFV metadata flag" into main