Merge "Add more trace categories." into pi-dev