Merge "Refactoring: renamed DeviceAdminDetails to DeviceAdminAdd." into sc-dev