Merge "Addressed T4T Ndef Nfcee improvements" into main