am 709941fd: Merge "Less intrusive VPN dialog and other UX tweaks." into lmp-dev

* commit '709941fd34e02fb6639ab31e04404b023c820dec':
  Less intrusive VPN dialog and other UX tweaks.