Merge "Add wallpaper to sync set during collection" into udc-qpr-dev