Merge "Refactor MobileDataPreference"