Merge "Update vpn icon from setting gear to vpn key." into oc-dev