Merge "Fix a deadlock WMG->WMS, WMS->WMG" into qt-dev