Merge "Merge "[Sb refactor] Add `dataEnabled` tracking to mobile repos" into tm-qpr-dev am: 10e2996b am: 30131318"