Merge "Fix media server restart detection mechanism"