Merge "Assign a new wallpaper ID when a live wallpaper is set" into nyc-dev