Merge "Don't hold sProxyLock while retrieving interface descriptors." into qt-qpr1-dev am: 69b6876c58
am: 452feaf477

Change-Id: I8ca2cd22a53bf0a15442447fbdba1981fd2aa7df