am 89c5a118: Merge "Don\'t crash attempting restore of uninstalled live wallpaper" into klp-dev

* commit '89c5a1180830934db485ff9c189143deab653310':
  Don't crash attempting restore of uninstalled live wallpaper