Merge "Add a test for OnMediaTimeDiscontinuity notification" into pi-dev