Merge change 26939 into eclair

* changes:
  Fix 2101425: Camera crashes spontaneously in preview.