MSC4140: drop delayed state interference#19495

AndrewFerr wants to merge 3 commits intoelement-hq:developelement-hq/synapse:developfrom

AndrewFerr:msc4140-drop-state-cancel-ruleAndrewFerr/synapse:msc4140-drop-state-cancel-ruleCopy head branch name to clipboard