Merge "Modify notification event callback function"