Merge "[Settings] Move display of VPN version into summary text"