Merge from origin/emacs-27

366a97c980 (origin/emacs-27) Avoid crashes when trying to load bad GI...
7938713105 C++ Mode: handle comma separated brace initializers.
2b95300cf8 * lisp/display-fill-column-indicator.el: Fix bug#41145

diff --cc lisp/cus-dep.el
Simple merge

diff --cc lisp/progmodes/cc-engine.el
Simple merge

diff --cc lisp/progmodes/cc-langs.el
Simple merge

diff --cc src/image.c
Simple merge