Merge "Fix PTS handling for buffer replacement" into mnc-dev