Merge "Remove VPN Overflow menu" into nyc-dev