am 6ecfb418: am c4d3ebd2: am 66b4da31: am 619a180b: Make wallpaper picker/cropper more robust

* commit '6ecfb418ba0f35eaaebf4dc08fff65520de813c9':