Merge change I1558a070 into eclair-mr2

* changes:
  Fix the camera preview demo.