Merge "Camera: Override enableZsl based on SDK version" into oc-dev