Merge "Stop PCM streams before attempting to close them" into main