Merge "Fix vorbis-specific workaround to only compare audio timestamps" into main