Fix setup display env leak

Merged Benjamin Berg requested to merge benzea/fix-setup-display-env-leak into master

Merge request reports