Change avatar, redact event, change avatar again results in wrong notification

[oddvar]

Change avatar, redact event, change avatar again results in wrong notification second time 'round: @oddvar:oddvar.org set their display name to oddvar.org
instead of
oddvar.org changed their profile picture

see the full convo here:
https://vector.im/develop/#/room/#freenode_#matrix-dev:matrix.org/$1460014785385041UXAjB:matrix.org

[yannicka]

I just tried and the problem is still present on Element Web 1.7.14.

[kittykat]

Deleting either event results in this:

And deleting both events actually deletes them.

Might be related to #18026 ?

[dbkr]

Confirmed this is still a problem