Merge "Disable no-channel exception, notifications will silently fail"