Merge "Camera: fix emulator deadlock" into oc-dr1-dev