Merge "Camera: fix dump/disconnect race"
am: bc5a836479

Change-Id: Iaaa9173d1f65f26d2b611c4cc6f7c25023d90b2a