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

* commit '1b1962f38304d2cbf12ac008791d93d3f1bdf0a6':
  Fix issue #3420898: More wallpaper issues