mediastreamer2!997 (merged)
Fix for https://mantis.linphone.org/view.php?id=12814
Cherry-pick de !4514 (merged)