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