Fixing issues 1) and 2) mentionned in https://bugs.linphone.org/view.php?id=10142#c46772
ms2:mediastreamer2!648 (merged)
