Merge "Fix rounding error accumulation of audio timestamp"