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

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