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

* commit '66b4da31045efedfbc3ee92d30a7a6303b403c45':
  Make wallpaper picker/cropper more robust