Merge "Disable "Notification Cooldown" for flicker tests" into main