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

* commit 'c4d3ebd2dd1a7a510ddf54b65d59a300e34e91f5':
  Make wallpaper picker/cropper more robust