Merge "Camera: fix deadlock" into nyc-dev