Merge "[Wi-Fi] Remove $ icon for metered Wi-Fi networks" into rvc-dev