Merge change I4c29c948 into eclair

* changes:
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution