Merge "Add init/cleanup hooks to notif listeners."