Merge "Fix issue #3420898: More wallpaper issues" into honeycomb