Merge "Fix frame duration computations after discontinuities" into udc-dev