Merge "Remove unused fields in ExpandableNotificationRow" into main