Update NewMessageNotificationManager to remove notification correctly