Merge "Guard against racy ComposerClient reconnection" into oc-mr1-dev