Merge "Fixed initialization check on BaseDeviceAdminDetailsPreferenceController." into sc-dev