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