Merge "Fix API compatibility for onTrackSelected" into main