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

* commit '1ff358ad2a0b2c0702fde65ff68f4656e55c545f':
  Less intrusive VPN dialog and other UX tweaks.