am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev

* commit '55b523cc3fac7fd008094b690a0fa8c5527d569c':
  [DO NOT MERGE] Fix wallpaper cropping bugs