Merge "Revert^2 "felix(nfc): Modify NFC overlays for NFC apex"" into main