am e40afdf7: am 0035b5ca: Merge "Fix issue #3415137: New wallpaper size breaks thumbnails." into honeycomb

* commit 'e40afdf7f44f30d78b0afc96717dae2bb883e3ea':
  Fix issue #3415137: New wallpaper size breaks thumbnails.