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

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