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

Change-Id: I770189a0a4a04d66d1d7e1d70d54404e0a6e1998