Conflicts from bug 1920960 it appears. Not sure if it'd be easier to rebase around that or just uplift that too.
Bug 1921972 Comment 24 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
Conflicts from bug 1920960 it appears. Not sure if it'd be easier to rebase around that or just uplift that too (both graft cleanly together).