Merge "Camera: fix race in disconnect and deleteStream" into oc-dr1-dev