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