ActiveDisplay and Notification fix

picked from vanir