Merge "Disallow too large display padding for wallpaper" into sc-v2-dev