Merge "[NAN] Rename setTerminateNotificationEnabled per API review"