am 51d9652d: Merge "Revert "Fix media server restart detection mechanism"" into klp-dev

* commit '51d9652d45ec0a22b625a8529479ba61cdb55314':
  Revert "Fix media server restart detection mechanism"