Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev