Merge "Add support for timestamps into SurfaceTexture."