Merge "Camera: Free buffers more aggressively" into oc-dev