Merge "Fix Wifi-Detail page colors"