Merge "Change wallpaper sizing" into klp-dev