Merge "De-couple data enabled from VT settings."