Merge "Use one surface for blurred wallpaper letterbox background option." into sc-v2-dev