Merge "Revert "Rename CONNECTED and NOT CONNECTED to IN SERVICE and OUT..."" into main