Merge "Merge "Wait until old ComposerClient is fully destroyed before recreating" into qt-dev am: d93c9f0c2d am: 27bca34020" into qt-r1-dev-plus-aosp