Merge "Fix for crash when setting live wallpaper."