Merge "Ensure VcnGatewayConnection#isQuitting never gets unset after being set" into sc-dev