Merge change I05fd0df0 into eclair

* changes:
  Fix potential deadlock in stopPreview/stopRecord.