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

Change-Id: I62fa67330411b38cfdc9189eaaee84a9940f267b