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

Change-Id: I1e8f38a8a15956c85b000d89645ff80cfdf125b8