Merge "Once restored, the wallpaper needs to actually draw" into nyc-dev