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

Change-Id: Ie0ba40a5f083994df070fbaed0b637e2433918ee