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

Change-Id: I2889aa0312049527e816927bf2fee61214891275