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