Merge "Change the heuristics for waiting for audiotracks to finish."