Merge "Fix pulsing notification overlap"