Merge "Bug 5234242 audio continues after discontinuity"