Merge "Add preference for WiFi MAC randomization."