Merge "Camera: fix use after disconnect error" am: 06d588e89b am: 677755f2e4
am: 57abaabdaf

Change-Id: I55d6931832e68549c2db3f7b4a992f605a2cb73d