EPD-159: Better handling of notification pop-ups