Merge "NetBpfLoad: enable mainline on T+" into main