Merge "Camera: fix various VTS issues" into oc-mr1-dev