Merge "Removing now-unnecessary forgetLoadedWallpaper()." into nyc-dev