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

* commit '314b922b12e63507666026b6dd7bdac983ec75a5':
  Fix wallpaper cropping bugs