Merge "For an RTSP live stream we won't map rtp time to normal play time," into jb-dev