am bdb7aee0: Merge "Fix for crash when setting live wallpaper."

* commit 'bdb7aee0a4934eb138f7caaf921f6c86f350b4b7':
  Fix for crash when setting live wallpaper.