Merge change 5317 into donut

* changes:
  Start backing up wallpaper