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

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