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

* commit 'e623e00199cf38786780ce18395b7366c1ff0948':