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

* commit '3a19c4788d8c05d176f70e7965f2bffd4de1b0d5':
  Fix wallpaper cropping bugs