Merge "Fix SFTRACE_ASYNC_FOR_TRACK_BEGIN" into main