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

* commit '5b1375445afef5ce0cbceaa69fc44667e3e358fb':
  [DO NOT MERGE] Fix wallpaper cropping bugs