Merge "Remove onBeforeNotificationAdded call"