Merge "Camera: fix flaky allocation test" into oc-dev