Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev