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

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