Merge "Fix overactive media routing"