Merge "Merge "Wait until old ComposerClient is fully destroyed before...
Merge "Merge "Wait until old ComposerClient is fully destroyed before recreating" into qt-dev am: d93c9f0c am: 27bca340" into qt-r1-dev-plus-aosp
am: e8b264f6
Change-Id: Ifb5c92ac2c741da835b4e10fe6d81a12aef8ee79