Merge "Add ability to show/hide Wi-Fi settings, and all related sub-settings."