Merge "hal: fix for voice + voip call concurrency"