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

Change-Id: Ie5e4ae5e81d80ae5b25878ce797964b283e69006