Merge "Fix a bug where VPNs start out suspended on cellular" into rvc-dev