Merge "Change setDiscontinuity API"