Merge "Implement server side playback timestamps with 64 bit accuracy" into nyc-dev