Merge "Gear Preference on VPN page includes subtitle if the vpn is an insecure type" into sc-dev