am 6ea9add6: am e81400c8: Merge "Fix crash when pick an image for wallpaper" into jb-ub-now-indigo-rose

* commit '6ea9add679cc0de8c6b132e9d0bffba75b1d4d47':
  Fix crash when pick an image for wallpaper