Merge "Don't complain if a VPN changes capabilities." into pi-dev