Merge from origin/emacs-27

62a6934af9 Fix crash when using XRender and restoring image from X (b...
de032d41c6 Bind k to image-kill-buffer in doc-view-mode-map.

diff --cc lisp/doc-view.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/image.c
Simple merge