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

* commit '2026a5a91feabaa8711d9fa1272fa9dbed355bcc':
  Fix wallpaper cropping bugs