Merge "Revert "bpf: change NetBpfLoad rc file from 33 (T/U) to 31 (S/Sv2/T/U)"" into main