Merge "Revert "Adjusts the USAP pool refill mechanism."" into qt-dev