Merge "Don't suppress pulsing notifications if we are already pulsing" into main