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