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

Change-Id: Icee6b0fb3599a6c32d039daa0d18deb719db443e