Merge "Data layer for device details refactor" into main