Merge "Don't hold sProxyLock while retrieving interface descriptors." into qt-qpr1-dev