Merge from origin/emacs-28

# Conflicts:
#	lisp/startup.el

diff --cc doc/lispref/display.texi
Simple merge

diff --cc lisp/international/fontset.el
Simple merge

diff --cc lisp/startup.el
Simple merge