Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON"