Merge "NoMan: Allow notifications to transition !ZEN -> ZEN"