Merge "Add trace sections to NotificationContentInflater" into main