Merge "Revert "Add DeviceEntryIconView after fingerprintProps are initialized"" into main