Merge "Fix settings UI for passpoint networks" into m-wireless-dev