Merge change 26997 into eclair

* changes:
  Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.