Merge "Camera: Add CONTROL_ZOOM_METHOD control" into main