Merge "Camera: fix deadlock" into nyc-dev
am: 7dd4ae63fe

* commit '7dd4ae63fe163287f06d00cc7756a9b7dd34bc25':
  Camera: fix deadlock

Change-Id: I932cc6566c6305716fdb3dc2d3f6119f35fa8774