Merge "Camera: Add metrics for zoom override usage" into main