am bf292a0b: Merge "Fix wallpaper cropping bugs" into jb-ub-now-jolly-elf

* commit 'bf292a0bd37959aa3b67df2daec3656f8178af68':
  Fix wallpaper cropping bugs