Merge "Fix creating unexpected letterbox surfaces" into sc-dev