Fill the Surface with transparent color if created without image
Handle merge conflict
Allow a surface to not have an internal texture, and create it only if we have to
Update comment block after merge conflict
Merge conflict
Merge conflict again
Revert "Merge conflict again"

This reverts commit 53b9aeef61e7ed40f64b37b866e24f265aaf645e.
Revert "Merge conflict"

This reverts commit 3828188ac0afc027e93f69417026574603b70a35.
Merge conficts