Merge "Add DeviceEntryIconView after fingerprintProps are initialized" into main