Ta/sc 246089/multi context flag listener issue extra tweaks

[tanderson-ld]

Requirements

• [ ] I have added test coverage for new or changed functionality
• [ ] I have followed the repository's pull request submission guidelines
• [ ] I have validated my changes against all supported platform versions

Related issues

Provide links to any issues in this repository or elsewhere relating to this pull request.

Describe the solution you've provided

Provide a clear and concise description of what you expect to happen.

Describe alternatives you've considered

Provide a clear and concise description of any alternative solutions or features you've considered.

Additional context

Add any other context about the pull request here.