Merge "Add traces for notification inflation performance improvement targets" into main