Merge "Fix deadlock when notifyPhysicalCameraDevice is called while waitUntilDrained hasn't completed" into udc-qpr-dev