Fix 9.2 conflicts for "Fix note header author and time ago wrapping in parallel diff"
- Encountered conflicts while picking !11702 (merged) onto
9-2-stable
- Please fix the conflicts and merge this into
9-2-stable
/cc @annabeldunstone
9-2-stable
9-2-stable
/cc @annabeldunstone