fix: event source tracking#470

nogringo wants to merge 2 commits intomasterrelaystr/ndk:masterfrom

test/469-event-source-trackingrelaystr/ndk:test/469-event-source-trackingCopy head branch name to clipboard