Merge "Update VPN Icon to key." into lmp-dev