Merge change 20812

* changes:
  Fix possible exception in default live wallpaper