Merge "Use the largest display size when calculating wallpaper crop size" into sc-v2-dev