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

* commit 'f36857e8b9d7d315d486e1ab1cd864c9be468622':