Merge "Refactor testUidTagStateDetails" into main