Merge "Fixes two data races in USAP pool management." into qt-dev-plus-aosp