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

Change-Id: I9bbaf6f73a28dfa4dceef329f08e0aa424bce6f5