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