Merge change Ie3ab4d0f

* changes:
  Restore live wallpapers if specified in the restore data