Merge "Add notification ID for APM enhancement"