Merge "Move onNotificationClear back to NEM"