Merge "DeviceRegistry facade"