Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev