am 6f1fda90: am 51d9652d: Merge "Revert "Fix media server restart detection...
am 6f1fda90: am 51d9652d: Merge "Revert "Fix media server restart detection mechanism"" into klp-dev
* commit '6f1fda90':
Revert "Fix media server restart detection mechanism"