Merge change Id60fa26a into eclair

* changes:
  Fix issue 2152541	thumbnail images stretched.