Merge "Refactor data layer of device details page" into main