Merge "Ensure that the audio codec instance is actually going away before we...

Merge "Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly."