Merge "Add a config to show the Vpn options menu." into main