Merge "Revert "felix: Replace NFC app with NFC apex"" into main