Merge "Fix potential crash in AppAllServicesPreferenceController"