Merge changes I80b93689,Ie767a9b8

* changes:
  Add capport info to WiFi details(WifiDetailPreferenceController2)
  Add capport info to WiFi details