Merge "NuPlayerDriver: Maintain the timeStamp after seek"