Merge "Camera: add HAL1 recording batching support" into oc-dev