Merge "Make NotificationListViewModelTest multivalent" into main