Merge "Revert "Create interface for NotifInterruptStateProvider"" into rvc-dev