Merge "Put a bandaid on a segfault in timed audio track handling."