Merge change 9008

* changes:
  Only restore the bits for wallpapers that aren't built in.