Merge "Add more information to existing notification_* events."