Merge "Hide VPNs from users that are hidden" into main