Merge "[NUI] fix TCT crash issue" into rel/api_4