Preliminary fix for NotificationManager to handle more than 2 message expire