Merge "Add UID for graphicsstats" into main