Merge "MediaClock: relax condition for time discontinuity"