Merge "Fix calculation of default wallpaper size" into klp-dev