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