Merge "Add VPN Key to signal icons" into lmp-dev