Merge "Show "no vpns added" for empty vpn screen" into nyc-dev