Merge branch 'fix/streams-failing-to-subscribe-on-login' into chore/videoconf-merge-two-prs-for-testing