Merge "Introduce TETHERING_VIRTUAL type" into main