Merge "camera: Drop pending preview for enableZsl shots" into oc-mr1-dev