Merge "[NUI] Fix FeedKeyEvent issue" into rel/api_4