Merge "Fix flaky lifecycle tests"