Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev