Merge "Revert "Fix media server restart detection mechanism"" into klp-dev