Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev