Merge "composer: Bail out early if previous WaitForCommitDoneAsync is stuck"