Merge "Wait until old ComposerClient is fully destroyed before recreating" into qt-dev