Merge "Update mobile data preference getter/setter"