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