Merge from origin/emacs-27

deef5efafb ; * ChangeLog.3: Update with the log of the last change.
bd991e3c9b Fix frame-inner-height in non-GUI builds

diff --cc ChangeLog.3
Simple merge

diff --cc lisp/frame.el
Simple merge