Merge "Move VPN hardware assumption check to the end of setup" into main