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