Merge "Less intrusive VPN dialog." into lmp-dev