Merge "Change number of preferences showing in ConfigureWifiSettings."