Merge "Revert "Add network_stack command for capturing and matching packets"" into main