Merge "Revert "Fix overactive media routing""