Merge "Show security info in saved network list" into oc-dev