Merge "Wifi Tile updates its label on Locale change"