Merge "Remove NotificationGutsManager from Dependency" into main