Merge change 25110 into eclair

* changes:
  synchronize access to pictureReady, copyContentPicture