Merge "Don't crash attempting restore of uninstalled live wallpaper" into klp-dev