Merge "Revert "barbet(nfc): Modify NFC overlays for NFC apex"" into main