Also fixes issues when dismissing a screen-sharing connection.
Requires D2191
./phpunit
Against dev/D2191 please
Try again to remove duplicate changes
Fresh merge of dev/screen-sharing-tokens on top of dev/D2191