Merge "Fix race condition in dumpDebug" into udc-qpr-dev