Provide entity context to DS block fields

I've reverted the patch, let's try again in ✨ Limit DS block Field Entity Context to Entity types which only has View Builder Class Needs review :)

I know this is closed but the issue persists. We're not using layout builder so 3415545 ✨ Limit DS block Field Entity Context to Entity types which only has View Builder Class Needs review didn't seem like a fit; happy to post there if I'm mistaken.

Use case #1 is the same as the original post. Details: ds display view mode (custom, not full/teaser etc) for content type "A", containing a ds block field which uses a view block on content type "B" with a contextual filter onto referenced content type "A"

Use case #2 is similar but a view page instead of block. Details: View page display on content type "B" with a contextual filter onto referenced content type "A", showing display suite "Full content" view mode for content type "B"

Patch 11 solved both use cases for us, up through ds 3.16. Starting with 3.17, all of the more recent versions and patches fail to apply or fail to solve one or both use cases. Comment 10's suggestion was already in place.

ds 3.30 with patch 11 came the closest, solving use case #1 but not #2

We're locked at ds 3.16 with patch 11 for now, which is a blocker for Drupal 11 (we're at 10.4.6)

Thanks for any help or insight