Merge "Issue 3395734: fix media server restart detection" into honeycomb