Merge "DeviceEntryIconViewModel uses isUnlocked flow with a slight delay" into main