Merge "Sanitize VPN label to prevent HTML injection"