Merge change 26103 into eclair

* changes:
  Handle restore of the original naive wallpaper backup schema