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