Merge "Fix user attribution of zen-related calls into NM/ZenModeHelper" into main