Merge "Media server death nodification"