This commit fixes the regression that unrelated environments
are teardown when a MR has been merged/closed.

This fix is still behind the feature flag.