Merge "Fix PTS handling for buffer replacement"