Merge "Make DeviceEntryIconViewModels singletons" into main