Merge changes from topic "hidenisp" into main

* changes:
  Create old or new provider based on flag
  Remove obsolete usages of NotificationInterruptStateProvider.