am 619a180b: Make wallpaper picker/cropper more robust

* commit '619a180be5a67f5bcd7021d300bd35e8b5296e7f':
  Make wallpaper picker/cropper more robust