Merge "Add DisplayDeviceRepository"