Merge "Not show connecting screen when editing a network"