Merge "Inject more into NotificationInterruptStateProviderImpl" into main