Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js

@@ -97,7 +97,10 @@ deviceModule = function () {
                             properties[constants["DEVICE_VENDOR"]] = constants["VENDOR_APPLE"];
                         }
                         deviceObject[constants["DEVICE_PROPERTIES"]] = properties;
+                        if (device["deviceInfo"]) {
                             deviceObject[constants["DEVICE_INFO"]] = device["deviceInfo"];
+                        }
+
                         response["content"] = deviceObject;
                         return response;
                     } else if (backendResponse.status == 401) {