Fix vai sort order, and sort all State columns by pseudo type and then name

Fix vai sort order, and sort all State columns by pseudo type and then name #21470