Merge change Ic1d72f56 into eclair-mr2

* changes:
  Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif to from the full image, if both can generate of a thumbnail of same size.