Merge "Camera: fix dump/disconnect race"