Bug 1015975 - Don't use the data enabled value from Single Variant if the user has made changes
Merge pull request #20386 from mcjimenez/bug1015975

Bug 1015975 - Don't use the data enabled value from Single Variant if the user has made changes
r=fcampo