Merge "Camera: fix dump/disconnect race" am: bc5a836479 am: 8b6831cf7b
am: 092cedda09

Change-Id: I24885f663939fa6aa5dfd550837e350c846798cb