Merge "Fix reading property from persisted AdiDeviceState" into udc-qpr-dev