Improved [Contactless] Card Security

Closing this topic as the discussion can continue in the other topic as @xnox suggests.