Merge "Update icon picker options, sort order, and descriptions" into main