Refactor session handling for better integration with BiDi (#1608)

SHA: 63a397f
Reason: push, by jgraham

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: jgraham