Merge commit 'd1dc8c30a969ec3539fc21b940789b2f23197756' into eclair-mr2 * commit 'd1dc8c30a969ec3539fc21b940789b2f23197756': Fix issue: no audio after media_server process crash while in call.