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