Merge "Clean up saved network screen"