Merge "Camera: fix deadlock with flush" into oc-dr1-dev