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