Merge "Make NotificationActivityStarter params non-nullable" into main