Merge "Add trace tags for notifications" into sc-v2-dev