Merge "Keep the merged WiFi indicators when WiFi toggle changes." into sc-v2-dev