Merge "Add UID to NSD metrics" into main