Merge "Once restored, the wallpaper needs to actually draw" into nyc-dev am: fcbe17e1e0
am: 3422c197a8

* commit '3422c197a82c6572fd2524bc636246ccb6b8a24a':
  Once restored, the wallpaper needs to actually draw