Merge "Fix memory leak in playback time accumulation"