Merge "Fix USB power regression when connecting USB headset during phone/voip call." into udc-dev