Merge "Fix call audio switch issue for BT LE to speaker and back to BT switch"