Merge "Track in-progress wallpaper API changes" into nyc-dev