Merge change Ic8093c11 into eclair

* changes:
  Hold a lock while we access the preview heap.