Merge branch 'device-properties'

* device-properties:
  device property: fix for a case of use-after-free