Merge "Fix a regression in the wallpaper drawing." into honeycomb