am 6635c44c: Merge "Fix assertion triggered when mediaserver dies at roughly the same" into jb-dev

* commit '6635c44c27a8fc2f1eeaaefd5dfc2e65464bcb5d':
  Fix assertion triggered when mediaserver dies at roughly the same