Merge "Update UI for Wifi Direct settings"