Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev