Merge "BpfInterfaceMapUpdater is only viable on T+" into main