Merge "Camera: Handle consumer side detach in BufferManager" into oc-dev