Merge "Wait until old ComposerClient is fully destroyed before recreating"...
Merge "Wait until old ComposerClient is fully destroyed before recreating" into qt-dev am: d93c9f0c am: 5cb7cc40
am: 9c2e7c1c
Change-Id: I6251930043fbe98efb4c34735826d00719389655