Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev