Merge "Sort lint list to make it easier to see where to add things" into main