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

Change-Id: Icfd874132ee26287e7d1b3e8e40ec9e1897a19a1