Merge changes from topic "jr_device" into sc-dev

* changes:
  Update NLS listing page
  Add device list to NLS pages
  Add icons to NLS mgmt page