lisp/gnus/{eww,shr}.el: Merge changes made in Gnus master