Merge "Restore connecting state for hotspot network on service connected." into main