Thanks for tying the threads together. When Álvaro raised the possible connection back in May, I concluded these were independent fixes for different problems, even though both already touch ResolveRecoveryConflictWithBufferPin().
That still holds, but with the deadlock-detector fix now ready for commit and heading to the back branches, the two reworkings of that function will collide. So I agree it should go in first and this patch should rebase on top.
