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

* commit '688e94eeff7512021eefd2db3161b2615df278c3':