Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.

See merge request !11478