Merge "Restore legacy VPN stats dialog." into lmp-dev