Fix/videoconf crashes

Merged Simon Morlat requested to merge fix/videoconf-crashes into master

Merge request reports