Merge "Don't show vpn info box when we don't have anything useful" into oc-dev