Merge "VPN settings: better a11y voice for legacy dialog" into oc-dev