Merge "Camera: remove capture session lock" into oc-dr1-dev