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