Merge "Revert "Add addService to pass in dump priority flags."" into main