Hmm. I could swear that I saw no resolves at all being made in RenderDoc. Although now when I revert to the default store action (which I hadn't seen involved a conditional resolve), they are still there. I think the invalidation bug somehow led me down the wrong path by looking into different store actions. What a waste of time Sorry for the noise.
I actually get a superfluous resolve too, but that one can easily be avoided by always disabling resolves on that pass.
Thanks for pushing the fix.