Merge "Fix SurfaceMediaSource timestamp handling."