Merge "Only set protectFromVpn if explicitlySelected is also true."