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

Change-Id: I4addf62e75478d8a2d9d707ed81974c5306998ed