Merge "Use scaled display size in wallpaper constraint." into klp-dev