Merge change 25719 into eclair

* changes:
  Fix 2128896: The thumbnail generated is overlapped with previous thumbnail.