Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev