Merge "View layer for DeviceEntryIconView" into main