Merge "Audio routing fixes for handover scenarios." into oc-dr1-dev