Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev am: e6fe1287c9
am: 21810b1dbf

Change-Id: I432b1b3f0539d4ec7b590573229a2f58a29e83f9