Merge "Introduce MobileDataAlwaysOnPreferenceController"