Merge pull request #121009 from akien-mga/displayserver-fix-display-safe-area-compat-breakage