Merge "Camera: fix use after disconnect error"
am: 06d588e89b

Change-Id: Ib5d543f7d8580f97f6d943641ecf77a1d5eb0419