Merge "Mark wallpaper as backupInForeground="true"" into nyc-mr1-dev
am: d5b0b9bb1f

Change-Id: I7c12efa23f81cad90cad9735c54c80fbdd4641dd