Merge "Camera: Misc VTS test fixes" into tm-dev