Merge "Fix issue #3415137: New wallpaper size breaks thumbnails." into honeycomb