Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb