am 0a1988b6: Merge "Make wallpaper cropper more robust " into klp-dev

* commit '0a1988b6477f012768f53f7e216b7defa45c8e51':
  Make wallpaper cropper more robust