Merge "Add Wifi STA/AP controls to connectivity tab"