Merge "Track scan count by UID"