Merge "Avoid trying to disconnect twice with ANGLE" into sc-dev