Merge "Add OnMediaTimeDiscontinuity notification" into pi-dev