Fix 9.2 conflicts for "Fix note header author and time ago wrapping in parallel diff"

See merge request !12004