6.1.0
[6.1] Fix none/codemirror editor width and height (#47305)
Merge branch '6.0-dev' into 6.1/maint/upmerge-260403